Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 17:37:38 +0000 (10:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 17:37:38 +0000 (10:37 -0700)

Trivial merge